From: kaf24@firebug.cl.cam.ac.uk Date: Tue, 4 Oct 2005 14:02:18 +0000 (+0100) Subject: Fix tools to pull public header files from standard X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16763^2~53 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=1cd0f4f23f8791b3df00205a13dfc9112e015f4f;p=xen.git Fix tools to pull public header files from standard location in libxc directory. Not direct from xen and xenlinux build trees! Also fix a type name in x86_emulator test harness. Signed-off-by: Keir Fraser --- diff --git a/tools/firmware/vmxassist/Makefile b/tools/firmware/vmxassist/Makefile index 8a7de85849..9d34c26677 100644 --- a/tools/firmware/vmxassist/Makefile +++ b/tools/firmware/vmxassist/Makefile @@ -25,9 +25,7 @@ include $(XEN_ROOT)/tools/Rules.mk TEXTADDR=0x000D0000 DEFINES=-DDEBUG -DTEXTADDR=${TEXTADDR} -XENINC=-I$(XEN_ROOT)/xen/include -I$(XEN_ROOT)/tools/libxc -#DEFINES=-DDEBUG -DTEST -DTEXTADDR=${TEXTADDR} -#XENINC=-I/home/leendert/xen/xeno-unstable.bk/xen/include +XENINC=-I$(XEN_ROOT)/tools/libxc LD = ld CC = gcc diff --git a/tools/firmware/vmxassist/vm86.h b/tools/firmware/vmxassist/vm86.h index 6ed20c7954..b15493215f 100644 --- a/tools/firmware/vmxassist/vm86.h +++ b/tools/firmware/vmxassist/vm86.h @@ -33,7 +33,7 @@ typedef int32_t s32; typedef int64_t s64; #endif -#include +#include #define NR_EXCEPTION_HANDLER 32 #define NR_INTERRUPT_HANDLERS 16 diff --git a/tools/ioemu/hw/i8254.c b/tools/ioemu/hw/i8254.c index c92a51ba51..b506acc695 100644 --- a/tools/ioemu/hw/i8254.c +++ b/tools/ioemu/hw/i8254.c @@ -22,8 +22,8 @@ * THE SOFTWARE. */ #include "vl.h" -#include "xenctrl.h" -#include +#include +#include //#define DEBUG_PIT diff --git a/tools/ioemu/hw/i8259.c b/tools/ioemu/hw/i8259.c index 06c39fb07c..17dd549c53 100644 --- a/tools/ioemu/hw/i8259.c +++ b/tools/ioemu/hw/i8259.c @@ -22,8 +22,8 @@ * THE SOFTWARE. */ #include "vl.h" -#include "xenctrl.h" -#include +#include +#include /* debug PIC */ //#define DEBUG_PIC diff --git a/tools/ioemu/hw/ioapic.h b/tools/ioemu/hw/ioapic.h index 1e70c865af..5e14174c21 100644 --- a/tools/ioemu/hw/ioapic.h +++ b/tools/ioemu/hw/ioapic.h @@ -26,9 +26,9 @@ #ifndef __IOAPIC_H #define __IOAPIC_H -#include "xenctrl.h" -#include -#include +#include +#include +#include #define IOAPIC_NUM_PINS 24 #define IOAPIC_VERSION_ID 0x11 diff --git a/tools/ioemu/target-i386-dm/Makefile b/tools/ioemu/target-i386-dm/Makefile index 856be8fe87..ec0c7a513a 100644 --- a/tools/ioemu/target-i386-dm/Makefile +++ b/tools/ioemu/target-i386-dm/Makefile @@ -6,7 +6,7 @@ override TARGET_ARCH=i386 INSTALL_DIR := $(DESTDIR)/usr/$(LIBDIR)/xen/bin TARGET_PATH=$(SRC_PATH)/target-$(TARGET_ARCH) VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw:$(SRC_PATH)/audio -DEFINES=-I. -I$(TARGET_PATH) -I$(SRC_PATH) -I$(XEN_ROOT)/xen/include/public +DEFINES=-I. -I$(TARGET_PATH) -I$(SRC_PATH) DEFINES+= -I$(XEN_ROOT)/tools/libxc ifdef CONFIG_USER_ONLY VPATH+=:$(SRC_PATH)/linux-user diff --git a/tools/ioemu/target-i386-dm/helper2.c b/tools/ioemu/target-i386-dm/helper2.c index 49c2804c72..a3c22d5f1a 100644 --- a/tools/ioemu/target-i386-dm/helper2.c +++ b/tools/ioemu/target-i386-dm/helper2.c @@ -47,8 +47,8 @@ #include #include -#include "xenctrl.h" -#include +#include +#include #include "cpu.h" #include "exec-all.h" diff --git a/tools/tests/test_x86_emulator.c b/tools/tests/test_x86_emulator.c index e6df8092bc..69989bc776 100644 --- a/tools/tests/test_x86_emulator.c +++ b/tools/tests/test_x86_emulator.c @@ -78,7 +78,7 @@ static struct x86_mem_emulator emulops = { int main(int argc, char **argv) { - struct xen_regs regs; + struct cpu_user_regs regs; char instr[20] = { 0x01, 0x08 }; /* add %ecx,(%eax) */ unsigned int res = 0x7FFFFFFF; u32 cmpxchg8b_res[2] = { 0x12345678, 0x87654321 }; diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile index 4d7097c64a..750adaaa29 100644 --- a/tools/xenstat/libxenstat/Makefile +++ b/tools/xenstat/libxenstat/Makefile @@ -38,9 +38,7 @@ SONAME_FLAGS=-Wl,-soname -Wl,libxenstat.so.$(MAJOR) WARN_FLAGS=-Wall -Werror -CFLAGS+=-Isrc -CFLAGS+=-I$(XEN_ROOT)/xen/include/public -CFLAGS+=-I$(LINUX_ROOT)/include/asm-xen/linux-public/ +CFLAGS+=-Isrc -I$(XEN_LIBXC) LDFLAGS+=-Lsrc all: $(LIB) diff --git a/tools/xenstat/libxenstat/src/xen-interface.c b/tools/xenstat/libxenstat/src/xen-interface.c index d3a560a69f..9358494d11 100644 --- a/tools/xenstat/libxenstat/src/xen-interface.c +++ b/tools/xenstat/libxenstat/src/xen-interface.c @@ -23,9 +23,7 @@ #include #include #include -#include "version.h" -#include "privcmd.h" -#include "xen.h" +#include struct xi_handle { int fd; diff --git a/tools/xenstat/libxenstat/src/xen-interface.h b/tools/xenstat/libxenstat/src/xen-interface.h index c60655a378..317e08581c 100644 --- a/tools/xenstat/libxenstat/src/xen-interface.h +++ b/tools/xenstat/libxenstat/src/xen-interface.h @@ -26,8 +26,9 @@ typedef uint16_t u16; typedef uint32_t u32; typedef uint64_t u64; -#include "dom0_ops.h" -#include "version.h" +#include +#include +#include /* Opaque handles */ typedef struct xi_handle xi_handle; diff --git a/tools/xenstat/libxenstat/src/xenstat.c b/tools/xenstat/libxenstat/src/xenstat.c index d5a4496192..c58a720bb8 100644 --- a/tools/xenstat/libxenstat/src/xenstat.c +++ b/tools/xenstat/libxenstat/src/xenstat.c @@ -22,7 +22,6 @@ #include #include #include "xenstat.h" -#include "version.h" /* * Types diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index e8cfca1b3f..7930789c8c 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -15,7 +15,6 @@ PROG_DEP = .*.d BASECFLAGS+= -O3 $(PROFILE) #BASECFLAGS+= -I$(XEN_ROOT)/tools BASECFLAGS+= -I$(XEN_ROOT)/tools/libxc -BASECFLAGS+= -I$(XEN_ROOT)/xen/include/public BASECFLAGS+= -I. CFLAGS += $(BASECFLAGS)